Require fontset conditionally again.

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 41f3f88d00c583ff484596b9c6bd4e50ae57659d..9ad1231c8eace89b05c8b2b8cbad56ec84afb08a 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -75,7 +75,8 @@
 (require 'faces)
 (require 'select)
 (require 'menu-bar)
-(require 'fontset)
+(if (fboundp 'new-fontset)
+    (require 'fontset))
 
 (defvar x-invocation-args)